tegra: move common features to a common makefile

For Non-Nvidia boards to include newly added features (like emc clock
scaling) it would be necessary to add each feature to their own board
Makefile. This is because currently the top Makefile automaticly includes
these features only for Nvidia boards.

This patch adds a simple Makefile include so all new features become
available for non-Nvidia board vendors.

Cc: Stephen Warren <[email protected]>
Cc: Tom Warren <[email protected]>
Cc: Thierry Reding <[email protected]>
Cc: Lucas Stach <[email protected]>
Signed-off-by: Marc Dietrich <[email protected]>
Acked-by: Stephen Warren <[email protected]>
Acked-by: Thierry Reding <[email protected]>
Signed-off-by: Tom Warren <[email protected]>

diff --git a/board/avionic-design/medcom-wide/Makefile b/board/avionic-design/medcom-wide/Makefile
index 864bc0ec01c614571a76d9ad4c4707258d7bab1c..e8c1e8b2876de438b01db20fc62f8e985f1eee0b 100644 (file)
--- a/board/avionic-design/medcom-wide/Makefile
+++ b/board/avionic-design/medcom-wide/Makefile
@@ -29,9 +29,11 @@ $(shell mkdir -p $(obj)../common $(obj)../../nvidia/common)
 
 LIB    = $(obj)lib$(BOARD).o
 
-COBJS  := ../../nvidia/common/board.o
-COBJS  += ../common/tamonten.o
+COBJS-y        := ../common/tamonten.o
 
+include ../../nvidia/common/common.mk
+
+COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
 

diff --git a/board/avionic-design/plutux/Makefile b/board/avionic-design/plutux/Makefile
index 864bc0ec01c614571a76d9ad4c4707258d7bab1c..e8c1e8b2876de438b01db20fc62f8e985f1eee0b 100644 (file)
--- a/board/avionic-design/plutux/Makefile
+++ b/board/avionic-design/plutux/Makefile
@@ -29,9 +29,11 @@ $(shell mkdir -p $(obj)../common $(obj)../../nvidia/common)
 
 LIB    = $(obj)lib$(BOARD).o
 
-COBJS  := ../../nvidia/common/board.o
-COBJS  += ../common/tamonten.o
+COBJS-y        := ../common/tamonten.o
 
+include ../../nvidia/common/common.mk
+
+COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
 

diff --git a/board/avionic-design/tec/Makefile b/board/avionic-design/tec/Makefile
index 864bc0ec01c614571a76d9ad4c4707258d7bab1c..e8c1e8b2876de438b01db20fc62f8e985f1eee0b 100644 (file)
--- a/board/avionic-design/tec/Makefile
+++ b/board/avionic-design/tec/Makefile
@@ -29,9 +29,11 @@ $(shell mkdir -p $(obj)../common $(obj)../../nvidia/common)
 
 LIB    = $(obj)lib$(BOARD).o
 
-COBJS  := ../../nvidia/common/board.o
-COBJS  += ../common/tamonten.o
+COBJS-y        := ../common/tamonten.o
 
+include ../../nvidia/common/common.mk
+
+COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
 

diff --git a/board/compal/paz00/Makefile b/board/compal/paz00/Makefile
index 7f7287ee9a039f291da3ca22961e88217cb0ebe5..fa5c510340284b4dd341e2a5d53e9c83a7e31358 100644 (file)
--- a/board/compal/paz00/Makefile
+++ b/board/compal/paz00/Makefile
@@ -20,9 +20,11 @@ $(shell mkdir -p $(obj)../../nvidia/common)
 
 LIB    = $(obj)lib$(BOARD).o
 
-COBJS  := $(BOARD).o
-COBJS  += ../../nvidia/common/board.o
+COBJS-y        := $(BOARD).o
 
+include ../../nvidia/common/common.mk
+
+COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
 

diff --git a/board/compulab/trimslice/Makefile b/board/compulab/trimslice/Makefile
index ff0787967de805db3558375ae8dddeae8317aa07..cc844d2e072dbca05352263f30a85b0286cf7c28 100644 (file)
--- a/board/compulab/trimslice/Makefile
+++ b/board/compulab/trimslice/Makefile
@@ -28,9 +28,11 @@ $(shell mkdir -p $(obj)../../nvidia/common)
 
 LIB    = $(obj)lib$(BOARD).o
 
-COBJS  := $(BOARD).o
-COBJS  += ../../nvidia/common/board.o
+COBJS-y        := $(BOARD).o
 
+include ../../nvidia/common/common.mk
+
+COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
 

diff --git a/board/nvidia/common/Makefile b/board/nvidia/common/Makefile
index a93d4583e748088284928079ad84dcac2d70c34a..f6f419e0ce1e4ffe0d85d851aaae47077a70521e 100644 (file)
--- a/board/nvidia/common/Makefile
+++ b/board/nvidia/common/Makefile
@@ -25,9 +25,7 @@ endif
 
 LIB    = $(obj)lib$(VENDOR).o
 
-COBJS-y += board.o
-COBJS-$(CONFIG_SPI_UART_SWITCH) += uart-spi-switch.o
-COBJS-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o
+include common.mk
 
 COBJS  := $(COBJS-y)
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)

diff --git a/board/nvidia/common/common.mk b/board/nvidia/common/common.mk
new file mode 100644 (file)
index 0000000..bd6202c
--- /dev/null
+++ b/board/nvidia/common/common.mk
@@ -0,0 +1,4 @@
+# common options for all tegra boards
+COBJS-y        += ../../nvidia/common/board.o
+COBJS-$(CONFIG_SPI_UART_SWITCH) += ../../nvidia/common/uart-spi-switch.o
+COBJS-$(CONFIG_TEGRA_CLOCK_SCALING) += ../../nvidia/common/emc.o